Skip to content

Merge forward 3006.x into 3007.x#68929

Open
dwoz wants to merge 8 commits intosaltstack:3007.xfrom
dwoz:merge/3006.x/3007.x-25-04-13
Open

Merge forward 3006.x into 3007.x#68929
dwoz wants to merge 8 commits intosaltstack:3007.xfrom
dwoz:merge/3006.x/3007.x-25-04-13

Conversation

@dwoz
Copy link
Copy Markdown
Contributor

@dwoz dwoz commented Apr 13, 2026

No description provided.

@dwoz dwoz requested a review from a team as a code owner April 13, 2026 10:16
@dwoz dwoz changed the base branch from master to 3007.x April 13, 2026 10:17
@dwoz dwoz added the test:full Run the full test suite label Apr 13, 2026
sujitdb
sujitdb previously approved these changes Apr 13, 2026
Copy link
Copy Markdown
Collaborator

@sujitdb sujitdb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread salt/modules/vault.py
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Take care, this downgrades the much improved 3007 Vault integration to the 3006 modules.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.

dwoz added 3 commits April 21, 2026 12:16
Restore full test_pkg_paths walk logic for salt vs root ownership.
Update vault token/approle tests to mock _get_master_client instead of
removed _get_token_create_url; keep namespace coverage via deprecated
fixtures.

Made-with: Cursor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test:full Run the full test suite

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants